https://pypi.python.org/pypi/django-curtail-uuid
Brightcells
5 zmienionych plików z 8 dodań i 22 usunięć
+ 2
- 2
account/admin.py
@@ -5,7 +5,7 @@ from django.contrib.auth.hashers import make_password |
||
| 5 | 5 |
|
| 6 | 6 |
from account.models import LensmanInfo, LensmanLoginLogInfo, UserInfo, UserLoginLogInfo |
| 7 | 7 |
|
| 8 |
-from utils.uuid_utils import curtailUUID |
|
| 8 |
+from curtail_uuid import CurtailUUID |
|
| 9 | 9 |
|
| 10 | 10 |
|
| 11 | 11 |
class LensmanInfoAdmin(admin.ModelAdmin): |
@@ -16,7 +16,7 @@ class LensmanInfoAdmin(admin.ModelAdmin): |
||
| 16 | 16 |
|
| 17 | 17 |
def save_model(self, request, obj, form, change): |
| 18 | 18 |
if not obj.lensman_id: |
| 19 |
- obj.lensman_id = curtailUUID(LensmanInfo, 'lensman_id') |
|
| 19 |
+ obj.lensman_id = CurtailUUID.uuid(LensmanInfo, 'lensman_id') |
|
| 20 | 20 |
if obj.password: |
| 21 | 21 |
obj.encryption = make_password(obj.password, None, 'pbkdf2_sha256') |
| 22 | 22 |
obj.password = None |
+ 2
- 2
account/views.py
@@ -10,8 +10,8 @@ from account.models import LensmanInfo, UserInfo, UserLoginLogInfo |
||
| 10 | 10 |
from account.serializers import UserSerializer, GroupSerializer, LensmanInfoSerializer, UserInfoSerializer |
| 11 | 11 |
|
| 12 | 12 |
from utils.ip_utils import ip_addr |
| 13 |
-from utils.uuid_utils import curtailUUID |
|
| 14 | 13 |
|
| 14 |
+from curtail_uuid import CurtailUUID |
|
| 15 | 15 |
from TimeConvert import TimeConvert as tc |
| 16 | 16 |
|
| 17 | 17 |
|
@@ -65,7 +65,7 @@ def user_signup_api(request): |
||
| 65 | 65 |
}) |
| 66 | 66 |
|
| 67 | 67 |
user = UserInfo.objects.create( |
| 68 |
- user_id=curtailUUID(UserInfo, 'user_id'), |
|
| 68 |
+ user_id=CurtailUUID.uuid(UserInfo, 'user_id'), |
|
| 69 | 69 |
username=username, |
| 70 | 70 |
password=make_password(password, None, 'pbkdf2_sha256'), |
| 71 | 71 |
user_status=UserInfo.ACTIVATED, |
+ 3
- 2
photo/views.py
@@ -12,9 +12,10 @@ from account.models import LensmanInfo |
||
| 12 | 12 |
from photo.models import UUIDInfo, PhotosInfo |
| 13 | 13 |
from photo.serializers import PhotosInfoSerializer |
| 14 | 14 |
|
| 15 |
-from utils.uuid_utils import curtailUUID |
|
| 16 | 15 |
from utils.watermark_utils import watermark_wrap |
| 17 | 16 |
|
| 17 |
+from curtail_uuid import CurtailUUID |
|
| 18 |
+ |
|
| 18 | 19 |
import os |
| 19 | 20 |
import shortuuid |
| 20 | 21 |
|
@@ -23,7 +24,7 @@ def uuid_init(request): |
||
| 23 | 24 |
num = int(request.GET.get('num', 1000))
|
| 24 | 25 |
|
| 25 | 26 |
for i in xrange(num): |
| 26 |
- UUIDInfo.objects.create(uuid=curtailUUID(UUIDInfo)) |
|
| 27 |
+ UUIDInfo.objects.create(uuid=CurtailUUID.uuid(UUIDInfo)) |
|
| 27 | 28 |
|
| 28 | 29 |
return JsonResponse({
|
| 29 | 30 |
'status': 200, |
+ 1
- 0
requirements.txt
@@ -2,6 +2,7 @@ CodeConvert==2.0.3 |
||
| 2 | 2 |
Django==1.8.4 |
| 3 | 3 |
MySQL-python==1.2.5 |
| 4 | 4 |
TimeConvert==1.1.3 |
| 5 |
+django-curtail-uuid==1.0.0 |
|
| 5 | 6 |
django-multidomain==1.1.4 |
| 6 | 7 |
django-shortuuidfield==0.1.3 |
| 7 | 8 |
djangorestframework==3.3.1 |
+ 0
- 16
utils/uuid_utils.py
@@ -1,16 +0,0 @@ |
||
| 1 |
-# -*- coding: utf-8 -*- |
|
| 2 |
- |
|
| 3 |
-from django.conf import settings |
|
| 4 |
- |
|
| 5 |
-import shortuuid |
|
| 6 |
- |
|
| 7 |
- |
|
| 8 |
-def curtailUUID(model, field='uuid', length=settings.CURTAIL_UUID_LENGTH): |
|
| 9 |
- flag = True |
|
| 10 |
- while flag: |
|
| 11 |
- uuid = shortuuid.uuid()[-length:] |
|
| 12 |
- try: |
|
| 13 |
- model.objects.get(**{field: uuid})
|
|
| 14 |
- except model.DoesNotExist: |
|
| 15 |
- flag = False |
|
| 16 |
- return uuid |